VDIFMRG - Visual Diff and Merge
Version 2.0

Visual Diff and Merge (VDIFMRG) is a software developer's tool for
finding and displaying the differences between two versions of a
source file, and for merging separate changes made to copies of the
same source during concurrent development.

VDIFMRG is meant to be useful by itself, or in conjunction with a
software configuration management tool which can automatically detect
conflicting source file changes during a "check-in" or related operation.

The VDIFMRG graphical interface utilizes color and symbols to distinguish
changes by type or origin, and this use of color allows the merge interface 
to display all text in a single window, instead of utilizing three or more
windows as do some merge tools. The merge function also attempts to perform
an accurate merge prior to displaying the result, thus reducing the user's
task to verifying correctness of the merge and resolving any conflicts (which
are automatically detected and indicated).

Both a 16-bit (Windows 3.1) and 32-bit (Windows NT/95 and Win32s) are
available. The 16 bit version is packaged as vdifmrg.zip, while the 
32-bit version is named vdifmrg2.zip. 

VDIFMRG is a shareware product of:

	Robert Alan Wright
	Alberta Software
	1194 Johnson Ave.
	San Jose, CA 95129
	alan@netgate.net
	alan@netcom.com

Current release information is available at the following URL:

	http://www.netgate.net/~alan/vdifmrg.html

Please see the help file for registration and usage information.

Version Notes:

Release 2.0: Updated for current Windows95/NT look and feel. Also
added some new display and output options.

Release 1.0, patch A: Contains fix for Windows 95 file dialog
imcompatibility. (Reverts to using old style file selection dialogs.)

Release 1.0: First version.